Reconcile with jb-mr1-release - do not merge

Change-Id: I4024b1fab0705f6b943ef6b0633ad9e29beacb73