Merge "Also test for additional NetworkCallback calls" am: dff6c5c30d am: 6978b2427c
am: 02310829cf

Change-Id: I0264a471312423e896a1c2f479c0eeda737a1567
tree: e32a1001ff19f8cab29b2479c5fc118935eafa26
  1. core/
  2. services/
  3. tests/