Try to fix build issues...

Change-Id: Ifa4f4dd0d404f2f67b535b0a4694f1f16314af20