another merge fix

Change-Id: I82306c2a49ab1c89cc35fa8ceb25ac61f2265023