am a6883539: (-s ours) am ef7aed89: Merge "DO NOT MERGE Cherry-pick of...
am a6883539: (-s ours) am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febc from master" into honeycomb
* commit 'a6883539':
DO NOT MERGE Cherry-pick of cd59febc from master