* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525': Merge e57aa434 from honeycomb-mr1. do not merge.