Merge "Auto zen rules reset for some upgrading users" into pi-dev