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

Change-Id: I4a58dc629d8562f33dcc0f43ef2b9aace8e91fa5