Reconcile with jb-mr1-release - do not merge

Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6