Reconcile with jb-mr0-release - do not merge

Change-Id: I79a1cf96dc3fb5ead2ace604370cbaed2d1bc534