Reconcile with jb-mr2-release - do not merge

Change-Id: Ib89e9670cf7e277b9b5d0563cf3f9e72e9e59834