Merge "Fix MultinetworkApiTest for instant mode" am: f2987a79a2
am: 1802980b98

Change-Id: I8cc151075f375597f71c5bb19e750475487b8209