Merge "Revert "Remove field from getSdkSandboxApplicationInfoForInstrum..."" into main