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

Change-Id: Iddcd90193ed419eef8e4c63bd37fd778d5bbd4f0