Merge "On OTA, MainUser is given to an Admin user"