build errors

Change-Id: I013198e8a2f6631f181e0b40c17d66b5a094d8e8