Reconcile with honeycomb-mr2-release

Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88