Merge "Cherry-pick f0e5e933 from master." into honeycomb