am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.

* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
  Merge 67450db0 from honeycomb. Do not merge.