Merge "Stop using __STRING unnecessarily." am: a59ecfd940
am: cab59654d3

Change-Id: I4bc04d7a28da3bd94adc44149e04d46cd050d1f9