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

Change-Id: I914c389f3b326eefdada42e2d55c116d308521c4