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

Change-Id: I51e4479f4d7fa868392ce807c38f3a2463be213d