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

Change-Id: I13b575f3c283cd561c9567b2465c8c74931b69f3