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

Change-Id: Ia08a840e47d3372772a105ef7b65bb259d07e7f8