move non aosp additions to soap