Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb