Reconcile with jb-mr2-release - do not merge

Change-Id: I389f30c71ba85475b8d80577f222cfa0d2485905