Fix invalid merge

Change-Id: Idcd5090005968ceb4f9fe1f6b200a781a04e63c7