am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

* commit 'b7b877a45f469336703844a928482e6438442567':
  Merge 9d76581f from honeycomb. do not merge.