[automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 2e64ca57b8 am: 330f7a7265 -s ours
am skip reason: Change-Id I076876a6662bde143ef7d315ce3767acafff93c1 with SHA-1 e693268f50 is in history
Change-Id: Ia71fd58217ec6dab128dc83781fb7e42e412472e
This commit is contained in: