Reconcile with jb-mr2-release - do not merge

Change-Id: I29c033be91cbfe80951c043ac96208d894fbda60