Reconcile with jb-mr1-release - do not merge

Change-Id: I9029b7e89fc2813f140408166e7a06f6784021c4