Merge "Remove usage of StringFactory"
am: 8a79748b0c

Change-Id: Ifebd392e5fec43089a3cd7722fbf6e3d6637f935