Reconcile with jb-mr2-release - do not merge

Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3