Merge \"Use granted userId to look up provider info\" into nyc-dev
am: f9f2c7ceef

Change-Id: I7af8b1867bb4a1784658f445c91158c0e4c43667