am bb03e3b7: am b61440b4: Merge "Cherry-pick of f5e4f208b9 to honeycomb" into honeycomb
* commit 'bb03e3b779ec2f5abfd8e07bf92001b229becc0f':
Cherry-pick of f5e4f208b9 to honeycomb
This commit is contained in: