Merge "USB restriction is similar to media restriction"