fix slight merge error

Change-Id: Ib66532c45296178950468998fc246d267855cdee