Reconcile GOOG and AOSP jb-dev

Change-Id: I122236ad5146083063a9f680f3b5486928b545a3