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

Change-Id: Ic92c37b93a5a20e1bed9ec523893b6179378ed4c