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

Change-Id: Icbc732125f31cc89025595cd2c6fcc060cee4f37