Merge "Fixes for handling users + default for USB" into oc-dev
am: 5262ae9b87

Change-Id: I507f57cc766345f61dfdf7cd7f2c32eb33e34de9