Reconcile with jb-mr0-release - do not merge

Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977