Fix build - derp in merge

Change-Id: I264b5ca6c7a9e131b215199b19f9365e12e602be