am 84b7472d: am 6766cc9e: Merge "allow apps access to the keystore, dhcp/pptp...
am 84b7472d: am 6766cc9e: Merge "allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access"
* commit '84b7472d':
allow apps access to the keystore, dhcp/pptp fixes, wifi fixes and isolated_app access