Reconcile with jb-mr1-release - do not merge

Change-Id: I02113763b6c6dfd96cf69377e244412d647a54f4