Return these two projects to AOSP