Fix ICS compilation errors

Change-Id: I658929bec4961946aa959b173cf83361ca22b14a