Merge "Stop using __STRING unnecessarily."
am: a59ecfd940

Change-Id: I4ec31b93772bd1740338c7e9f7e3aba9f14ac602