Reconcile with jb-mr0-release - do not merge

Change-Id: I73b0e0fc038184d29990df18c3e0f5521f64131a