[automerger skipped] Merge "Use NetworkStack.getService in NetworkStackClient"...
[automerger skipped] Merge "Use NetworkStack.getService in NetworkStackClient" am: 79f73061 am: 1779c59a -s ours am: 2b667f27 -s ours
am skip reason: Change-Id Ibeaeff5890631e14581a084863d9aeb3178c5d5c with SHA-1 62ea8f72 is in history
Change-Id: If95c1542c143a926e6fa0316f51138aee27f1e32