Reconcile with jb-mr2-release - do not merge

Change-Id: Ia1e9aa160247d491cc60c1dcc7a73c8545410d78