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

Change-Id: I611d9e21a8e70e2e99de078e5218e34961cf7ee7