Merge "USB restriction is similar to media restriction" into nyc-mr1-dev