Keep in sync with Honeycomb-MR2 Change-Id: I2ecc0a945bd202e83b8c13879b3d22abc4287918
Change-Id: Ie07dc956ea5c40b760d511976e42f847f0f68f9f