Reconcile with jb-mr0-release - do not merge

Change-Id: Iefb0fa4bd43eaa8fef120035ae0f81f0b001dad6