Reconcile with honeycomb-mr2-release

Change-Id: I378ee5b52951c71a761c9e2e8234dcb0c0d4fced