Merge remote-tracking branch 'm/jb-mr1' into jb-mr1

Change-Id: Ifc15c8f167341ca5bd4899d29f09d077797c383c
Merge remote-tracking branch 'mp/jb-mr1' into jb-mr1-bluez

Change-Id: I496f4ba7e7579291100edd5c76f8db06c86b34dd
Merge remote-tracking branch 'mp/jb-mr1-bluez' into jb-mr1-bluez