Fix build errors.

Change-Id: Id401a586a8f838da5fd29335625de081b4ff0a60