Reconcile with jb-mr2-release - do not merge

Change-Id: I4e399f8f0b110b7b46c6cf6a65fdc908acb4f9ce