am 0a98226e: Merge 9d76581f from honeycomb. do not merge.

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