Fix build breakage

Change-Id: I70d2dad01c2cc6da222b7e2e92246e8f3c0bb47b
5 files changed