Reconcile with jb-mr2-release - do not merge

Change-Id: I618d51505419200bc282404ec2af470be97f1fa7