Merge "DO NOT MERGE Accommodate limitations of CTS web server" into mnc-dev
am: 78e816baa1

Change-Id: I35bb5d765e6f5a76511c8c73377f481666d74856