Reconcile with jb-mr0-release - do not merge

Change-Id: I22a716496e377e047ccf9d19cd30833225707565