Reconcile with jb-mr1-release - do not merge

Change-Id: Idb9359eee8e8aafd50f8bec1202536d842ac8cbb