Reconcile with jb-mr0-release - do not merge

Change-Id: I29880eeaee48f2f841d9bfbf21c310e495f26ddc