Merge "Adding required annotations to mark SystemApi" into main