initial aoba aosp support