addl changes for aosp