DO NOT MERGE: Make the tests permissive for N MR1 and MR2 am: e0caf3aaff am: d6428ff7ae
am: ab53bba172  -s ours

Change-Id: I9fd3e4ee6c700111eef656af41cb68252cf16c1f