Reconcile with honeycomb-mr1-release

Change-Id: Ia9ced1a9af3d7a04c08800387b1acf258f13bd95