DO NOT MERGE Stricter NetworkNotificationManagerTest am: 85a6c96ef3
am: b2966ad433  -s ours

Change-Id: I5146235a579a66e8101106f288624fa2c00c4d43
tree: a7cc2edcf81156b32b6915459024d506c6314023
  1. core/
  2. services/
  3. tests/