Fix missmerge

Change-Id: If40150fe2b6d8d366883de3c708c251e6a77e87c