Merge "Remove usage of StringFactory" am: 8a79748b0c am: 49b054800d
am: 0f06280ea9

Change-Id: Iff0743fbae887558de67e6f8da314c4ff355dc02