Merge "Not clearing data for a package that is a DO or PO" into nyc-dev