Reconcile with honeycomb-mr2-release

Change-Id: Iec7f78f0f58c018ee36e67d6e8d89ca02d6a9383