RC: fix missing strings due to merge errors

Change-Id: I128b9f8729d4388675fc2e1513a0499763794fca