Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: I30d8a859ae8573bd3892bf1f7e400b4b1bb3476e