Fix leftover

Change-Id: I5eabcc171811211dda61c905b44cc118a2533de8
Merge "Fix leftover"