am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit 'c7b87766b21fe5cf2f644efa8753b936d413dc9a':
  Merge 2402ad60 from honeycomb-mr1. do not merge.