Merge "DO NOT MERGE: Fix CTS Verifier instructions." into nougat-mr1-cts-dev
am: 6323d70856  -s ours

Change-Id: Idca0a5c1b7cc2e3dce653aa6177a08a7dac53eef