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

Change-Id: I07ffd44995f02108e9a981fd590e7e29ff813e7f