Merge "Merge "DO NOT MERGE: Cherry pick CTS test fixes from mr1." into nougat-cts-dev am: 571235b132  -s ours" into nougat-mr1-cts-dev