Fix some Strings that went missing during merger

Change-Id: Iebb8b54c8d3574fe327e7f489e416a6730f8388e