Update snapshot of policy/api to 2.6.1-SNAPSHOT