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

Change-Id: Icf16741de4c0d248e5ffe3ef3b31ce6ce51c4c9f