Merge "[POLICY] Add configurable acm parameters"