Merge branch 'jb-mr0-release' of https://android.googlesource.com/platform/development into aosp-merge

Change-Id: I5f6ea8eb23b51313a45b7ab5f5c332ee6d33365d