Merge "Merge "Revert "DO NOT MERGE disable UsbTest"" into oreo-mr1-cts-dev am: c7de241ee5  -s ours"