Merge "DO NOT MERGE Accommodate limitations of CTS web server" into nougat-mr1-cts-dev
am: e81b1856d8  -s ours

Change-Id: I5cd77ae5039a1a2e103c9bb8210394b9372d6f97