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

Change-Id: I9d78e7dd4f410c331a920294d9375118cc43a007