Fix merge error

Change-Id: I0914f52d1225fed8ce5697dcb05664bb7962f6ee