Merge "Correct naming of userdata partition size variable"