Merge "Tidy up MockWebServer usage" am: 294ab080f4 am: d0dc901341
am: 47eedc3503

Change-Id: I96d3b4b5b7123bbbcac58d5838985c618fa9122e