Reconcile AOSP and GOOG jb-release

Change-Id: I839cd906eb192f42bb679f20cdd39b71394cec70