Fix build errors.

Change-Id: I1ed4c8fc10cead3304aaf73485b3f1990414ee37