Merge changes from topic "networkagent"
am: 0ed49867e2

Change-Id: Iaebb3aaced18257f4beffacc13a0d87efa1a7ec7