Merge "Restore strings that were deleted by ag/997534"