Reconcile with jb-mr1-release - do not merge

Change-Id: I506a8d1b8014f03b954338c90a3f986a457d65bd