Fixed merge error

Change-Id: I5cc08ea3bc8272e152d22ddde99296327bc06f9b