Merge "Add NETWORK_STACK permission" into oc-dev am: 087daa0da5
am: fe523c4917

Change-Id: I7313069148ed7cec4975b7039e71615a64169186