Reconcile AOSP and GOOG jb-release

Change-Id: Ia2b3ff4617a72ba3771fc2ed829e2d7c7c83e611