Re-switched to AOSP-ICS branches - stable -