[automerger skipped] Merge changes from topics "api-fix-networkagent",...
[automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: b7b68cb3 am: 5e04f349 -s ours
am skip reason: Change-Id Ifd93d2ae0fc14bef83d2bcb92ca3b79c13c14800 with SHA-1 daefcdb8 is in history
Change-Id: I4fef4c7cf6893a21dff47f6fec79638072c5a1c7