am b243aabd: Merge adaa12cd from honeycomb. do not merge.

* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
  Merge adaa12cd from honeycomb. do not merge.