Merge changes from topic "networkagent_api" into rvc-dev am: 33accffc am: 32f4a5f9 am: 80d57c34 Change-Id: I4d5850574ec64203ad3b10cc51fc1572b4799ca3