Merge "The volume controller has notification policy access." into nyc-dev