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