Merge "Revert "Set min_sdk_version:34"" into main