Merge "Added network service interface" am: 71793be6bb
am: 2b06789511

Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79