Merge "Add UID for network stack app" am: 354d5f27ff am: e666f08f5b
am: 0041f158cd

Change-Id: Ia418bf648ca6d7dbd8df8f40c0c231def36a6672