Reconcile with jb-mr0-release - do not merge

Change-Id: I5bf193fecac93033d3e224eb75b477f14077b05f