Merge "Reland do not give app id for sdk-library package" into main