Reconcile with jb-mr2-release - do not merge

Change-Id: I23e62c9126054bf0b34fe9125bca81bf6791006f