Merge "Remove redundant action triggers on persist.sys.usb.config" into nyc-mr1-dev