Fix recent merge

Change-Id: I16764c6d0d4864691db7e48b5409bdf964647022