Reconcile with honeycomb-mr2-release

Change-Id: If4754920ba3d9c25730d0d939235ea779a510369