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

Change-Id: I11a4fca78ec2504b9f57b31c2a312f2328e5dfde