Reconcile with jb-mr2-release - do not merge

Change-Id: I024b04bf1e47cc7c10209e83f640cc6f12e03274