* Remove newAddressSet * Add count and get functions. * Fix lint (cherry picked from commit 7988c044e0)
7988c044e0