Reconcile with jb-mr1-release - do not merge

Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc