Fix bad merge

Change-Id: Idb7782517aa656c03d86749e4d34cfa3627ee717