Fix build errors

Change-Id: I9bcf6bcdaea0acacced020c4e4fd195bd34627cd