fix setting only usb mode

If you cleared the last usb mode it would fail (and so would setting
it if you started with none). This fixes it to set and unset the
last property correctly.

Change-Id: I8aa62a65ccda5f3872d2995f30d80426f07a281c