Merge "Check uid for notification policy access." into nyc-mr1-dev