[automerger skipped] Use the new NetworkAgent API am: 29a08dde am:...
[automerger skipped] Use the new NetworkAgent API am: 29a08dde am: bf84f973 -s ours am: 92f50864 -s ours am: 30a4f976 -s ours
am skip reason: Change-Id I1ce0209824dc74f38e2223ccfbf5e1c031404f69 with SHA-1 1efdefc4 is in history
Change-Id: I5a50ded76c56a6e57e1a5d25f261744b04740b52