Fix typo in manual merge

Change-Id: Idaf98e368e032cfbd7fbe3aa2d965b04eea3f43e
1 file changed