am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread

Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'

* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
  Remove development-only code.