Reconcile with jb-mr2-release - do not merge

Change-Id: I541e66a266a81d270b206ead6c8b5b67489d63ef