Reconcile with jb-mr1-release - do not merge

Change-Id: Id228f3f2787e977efe8f0a67a3c350f682b4f9f8