Merge "DO NOT MERGE: Fix CTS Verifier instructions." into nougat-mr1-cts-dev