Remove usage of removed ValueFormatter Result interface

Change-Id: I65fb90574ecd54f38ae8d6d2c73d41df2f4c9e0b
Merge branch 'master' into sqlstore