fix bad merge

Change-Id: I5fa5f0879e1c807f13addb345130ed58d5e3dfb0