Merge "Change --userdata-flash to use enum."