Merge "Removing remaining code around ENABLE_DATABASE_RESTORE" into udc-dev