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

Change-Id: I9425cc662e6dab72dbf36353f404defc3599d7a9