Merge "Make duplicate intern string check be debug only" am: 54d2c7e503 am: bfcc339852
am: 32e601e638

Change-Id: I35fd1ac2a3f68a7f60c963cc7c5a560d3f2da45c