For the purpose of these two weapons, the answer to that is, yes, because the people who acquired those firearms during that period of time did so according to the law that existed at the time, and they did so in good faith.
On May 8th, 2018. See this statement in context.