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

Change-Id: I9a27fe8d2769efee97e2d5be719d783ac1a34de1