Cherry pick combining multiple custom policy installs into one operation