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

Change-Id: I9d4bc8236d8516146b4687ce3b02adaa8875948c