Remove strings left over from a conservative merge

Change-Id: Ib154fa7c89685eb39c74865122066de316a30cce
1 file changed