Fix the build, for real

Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
3 files changed