Fix faulty merge

Change-Id: I0ae4453f30412d6abfda7063cd47274e02016f89