Fix up mismerge

Change-Id: I6e609dabb0264ea609eb42264ac84c55ec49aab7