Fix derp in merge commit

Change-Id: I1fbf0ca2ba25764134a7998d57eaa61d74494403