Reconcile with jb-mr0-release - do not merge

Change-Id: I5dabbbe549afc3fb00e81f0425c3dcaad91fc8ba