Merge "Update the allow list inside apex_shim.cpp"