Merge "Use enum class for DropReason"