Merge "init.common.usb.rc: remove duplicate trigger"