am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.

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