Fix build

Change-Id: Ibd660540a3065fe0e847cef970a5cf27e7705f3d
Merge "Fix build" into kitkat