fix mismerge - herp derp

Change-Id: I3ad2b05479f5e1446c11f09c8d063554d07d7d14