Fix build after rebase

Change-Id: I00f108e57eb60bb82bb823a7f57d180a42af2ea0