Merge "Update getInterfaceVersion checks to include -1"