Merge "Update Vendor API Level to 5" into main