Merge "Use granted userId to look up provider info" into nyc-dev