am 0c23c97c: am 06522ef5: Merge "Remove some commented-out code."

* commit '0c23c97c78211bc98c3dadd7f613e764e183a0ea':
  Remove some commented-out code.