Reconcile with jb-mr0-release - do not merge

Change-Id: I653582aefecf2ec0351f9b9b663f0610d679f7ea