Merge "restrict app access to socket ioctls" into mnc-dev