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

* commit '87d7ef50737255a31359f2c8635c366c5cf8880a':
  Switch VVM SMS filter to Builder pattern

Change-Id: I814fa9fc55a1ac553c4ac5cc2c635a27864506e1