Reconcile AOSP and GOOG jb-release

Change-Id: I2cee4571848de79427356a6fcfe8da59ae34e70f