Merge "Partial revert of CL 101621" into honeycomb-mr1