Follow-up from "Use a more specific policy for new approval rule model"

The following discussion from !194509 (merged) should be addressed:

• @hmehra started a discussion:

  nit (non-blocking): This condition should be optimised after the FF is cleaned up.