Merge \\"Check uid for notification policy access.\\" into nyc-mr1-dev am: 488153094c
am: 5d89ccadb5

Change-Id: Ic22bb1ef2ec3626f0101603fef3d043d6a3f3307