Reconcile with jb-mr2-release - do not merge

Change-Id: Ifd47b9ed799076e9dc5141889f1de6c295286a2a