Reconcile with jb-mr0-release - do not merge

Change-Id: Ia4a12308b845a8c8403e86132c284a876e0f0676