Merge "Tidy up MockWebServer usage"
am: 294ab080f4

Change-Id: Ia22ce1e949ba3b611c0f2be60b3dbbafef7e4bb6