Merge "USB restriction is similar to media restriction" into nyc-mr1-dev am: f9ca06b367
am: ae23c07073
am: 96d81b1332
Change-Id: I9469b566e8682162271992f3175c5153c4668614
This commit is contained in: