Reconcile with jb-mr2-release - do not merge

Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726