am bf8364fb: am 11b34626: am 381a2a6f: remove unused code.

Merge commit 'bf8364fbf7d418099acfed2c79b2adba8973b8ab'

* commit 'bf8364fbf7d418099acfed2c79b2adba8973b8ab':
  remove unused code.