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