Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r31" into nougat-cts-dev am: aab6efba94 -s ours am skip reason: subject contains skip directive" into nougat-mr1-cts-dev