Fix build breakage.

Because of refactoring, can't directly use the cherrypick as is.

Change-Id: Ic0d7bd95701c955c6277b065e6975e238209ff9f
1 file changed