fix a bad merge by me

Change-Id: Ia6adf813efdd98ec5117d7867dc1e1285ab9de49