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