Merge "Adding userHandle in ResolveInfo"