Reconcile with jb-mr2-release - do not merge

Change-Id: Icd0c5b2ee2eb802d10f2d7f5559488a0c6202029