Merge "Accommodate limitations of CTS web server" into klp-dev
am: 3a28834a6b

Change-Id: Idd09b094246de2a87a8b1d511edb903ff95810fd