Merge "This should fix the build for now." into ics-aah