Initial CAF AOSP Changes