Reconcile AOSP and GOOG jb-release

Change-Id: I4cc25b61eec4fd2e087dae2e11f12cbb659891a3