Reconcile with jb-mr1-release - do not merge

Change-Id: Id8e9b62ec7d117c1b6bdbeb739be7148f15f31cb