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

Change-Id: I650905eab82abf2471cd2e5e7b950cdf16c476dc