Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d
am: 47d8385184

Change-Id: I19ff91b1397abe20920bbae8aa6c976c6bcac0ba