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

Change-Id: Ifdc59a76e80016641f2af7168eff2988d75b37a7