Fix compile issues; squash before merge.

Change-Id: Icbedc2ce374614ba371e75524bee8e70d3ae0bf6