Make apollo survive usb mounts

Change-Id: I83fd54249918d96d6c0fac314b9c30faf1c77718