Reconcile with honeycomb-mr1-release

Change-Id: I200a7f476eaefab1044101fa5d4ab022c332f159