Reconcile with honeycomb-release

Change-Id: Ic2b2fe51f052e8b2a2d04f058354490e9cea07ae