Merge changes from topic "networkagent" am: 024e520f2d am: 4c14caf355

Change-Id: I4815caf8d3fb63f2b585b231b2d926e381b26010