Reconcile with jb-mr2-release - do not merge

Change-Id: Id35004f465f5152c1de0796eb66989f234185208