Reconcile with jb-mr1-release - do not merge

Change-Id: I94d9dadde4adb1039e5e5b2cf9167184af9cec49