Merge "Treat allowlists differently for flattened apex"