Initial Update for AOSP