Add compatibility for Ice Cream Sandwich