Reconcile with jb-mr2-release - do not merge

Change-Id: I49eb0fa91c0c510075419629195dcb27b9359e7d