Fix merge error

Change-Id: I3700ea6882ec8981a73f77df6aae0a916bc8aadf