Reconcile with jb-mr2-release - do not merge

Change-Id: Ic2bedc28934c86a1d84c86ef081abba066b9f1e7