Reconcile with jb-mr1.1-release - do not merge

Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc