Merge "Use correct API version for UTF-8 checking"