fix after merge

Change-Id: I3b047e821ddfd9ae4846c7e6e2ad3fede89ae50f