Merge "Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am: f874fd319e am: c5a4576cab"