fixing mismerge

Change-Id: Ife0994414a56d152592036bb6687227ec315cd85