Reconcile with jb-mr0-release - do not merge

Change-Id: Ic11777d21ec45a3ff544ecb40cd08e69158560b7