Reconcile with jb-mr2-release - do not merge

Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702