Reconcile with jb-mr1-release - do not merge

Change-Id: Ic400b5287afc2fcb3a6205e5e57aa89af6572911