fix after merge

Change-Id: If75b26600a05c021e97a96f0eb8bfdca54e4d587