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

Change-Id: Iee4af268c5c2930c59ee237e796467d79cedbbfc