fix merge errors

Change-Id: I8d31004a2afac2ff02433c6639158fcfc6ec9974