Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r29" into nougat-mr1-cts-dev am: 83139f4c6f -s ours
am: 187af42e3f -s ours
am skip reason: subject contains skip directive

Change-Id: I29917bbb0c791ad93eed0ccfd929ac40c58865c6