am bc9b5f0f: Merge "Partial revert of CL 101621" into honeycomb-mr1

* commit 'bc9b5f0f284ad59a28e3c578630e3c9eb6dba99e':
  Partial revert of CL 101621