Fixed another build failure caused by 2 refactorings.

Change-Id: I71f678e60586706ba427485055c26059bb68caa6