fix bad merge

Change-Id: I39ad34ca92854ba2e6b78928c7c82c3e1caf3b66