Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev