Reconcile with jb-mr2-release - do not merge

Change-Id: I1e981404c88dd61fe418ae799d599ae4d072555c