Reconcile with honeycomb-mr2-release

Change-Id: Ie64c22de6fee25395210fed13ed0bf2f53fa004f