Reconcile with honeycomb-release

Change-Id: I2716b91f5b133ffd4b908227315129a5041fb3c6