Reconcile with honeycomb-release

Change-Id: I83818e0c61f0fcb53b154cd0a85f18924745912f