Fix build - merge derp

Change-Id: If87c88fb0e2bf4a06559c24a6050c103c31ba899