Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e

Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc