Fix merge error

Change-Id: I3dea0c4d2e86f93ca16123d2c92b0fc0aefe1f7e