Merge "Fix Network request test fail in CTS-Verifier" am: 4a475a6184 am: 698478f68f

Change-Id: I7a67ef5a05960baedd5dea379dcc33ee5062cecc