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

* commit 'b187571a1f168da007de9d8ec14dd2d6984e86f4':
  Switch VVM SMS filter to Builder pattern

Change-Id: I07363f71fde4e1603ace00f86dd053a775882ca1