Merge "Stop using __STRING unnecessarily."