Merge "Reset the default usb package less often" into oc-dev
am: 1654143680

Change-Id: I8c7986ed572aea065140999281c91424aade8f48