Merge \\\"Initialize MockWebServer in setUp() not construction time\\\" am: f3c312b25a am: aa66709b3b
am: 7057017d19

Change-Id: I867c7c9b9de0913199f0787dfcbb044d82295322