Reconcile with jb-mr1-release - do not merge

Change-Id: I8b11105764f62150a9aff92595c672e7fc448b7d