Merge branch 'AOSP/jb-mr2.0.0-release'

Change-Id: Ia16a1d1c4f5fb0c428449acbb6a633dfbc8d0f68