Merge "DO NOT MERGE: Make the tests permissive for N" into nougat-mr1-cts-dev