Fix derp from previous mismerge

Change-Id: Iedf666301b1c733f045bcc4243f07e1c8bf268d1