Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am: f597b81b4e am: ca1ca2c465
am: bc60d7b06e

Change-Id: I06a64bbfaa501f860d7078cb2cc6d9af60b57eb8
tree: 1ef68df9d9d03ac8b31f03bbf2d31246100f55c2
  1. core/
  2. services/
  3. tests/