Merge "sepolicy change for NetworkStack signature" am: ec651944a0
am: 286bce8bfb

Change-Id: I928586bbaa8bc37ee38012e6e9fc98eb8840f3c4