Changes for AOSP (again)