Reconcile with jb-release
The Android Open Source Project authored
Change-Id: I10426d9f97b0d78f9a49bbb170d8e0842883b4f9
90a0a36c