Fix another merge error

Change-Id: I3a6d2381fb91272586e4b150bf659c5bd85a8b99