Fix build aflter conflicting changes got in.

Change-Id: Ia3846e9a0dad137fe797bf3f2ece0cb78c106ec0
1 file changed