Duplicate strings from bad cherry-picking
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: If2d1a99d40679ef30679a173d17dc0032f95ee05