Merge changes from topic "networkagent" am: 0ed49867e2 am: 23d5f84adc

Change-Id: I4815caf8d3fb63f2b585b231b2d926e381b26010