Merge "DO NOT MERGE Disable checking for unknown type" into android13-tests-dev