fix after merge

Change-Id: If122b1c2055d7a81a0ca596778be357c347e682d