DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cac...
DO NOT MERGE: Further restrict access to socket ioctl commands am: 57531cac am: c0ce53cc am: f290a2dd am: d76ccadb
am: bf6a2351 -s ours
* commit 'bf6a2351':
DO NOT MERGE: Further restrict access to socket ioctl commands