Merge "Fix MultinetworkApiTest for instant mode" am: caab874e34
am: 42720426e1

Change-Id: I8cc151075f375597f71c5bb19e750475487b8209