am d35498f6: am 1a140bf6: Merge "Remove some obsolete code." into gingerbread

Merge commit 'd35498f6062410e777d6ad41a720db32336e2089'

* commit 'd35498f6062410e777d6ad41a720db32336e2089':
  Remove some obsolete code.