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

Change-Id: I691facccdb80ab4ff930f3af6b80bbf0244cf9e3