Reconcile with jb-mr2-release - do not merge

Change-Id: If31e9b86b9566b1b9fa008d30307d385c4710997