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