fix miss merge

Change-Id: I2cb89aacd7edc78cb45b6653a50efc162f099052