Merge "Revert "Do not give app id for sdk-library package"" into main