Reconcile with jb-mr2-release - do not merge

Change-Id: I46e32f210b004047f9b3714595cbdea459eafedd